Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 17 Feb 2010 13:43:12 +0000 (13:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 17 Feb 2010 13:43:12 +0000 (13:43 +0000)

Trivial merge